merge with xen-unstable.hg

diff --cc unmodified_drivers/linux-2.6/platform-pci/Kbuild
index dda3d0e7cf61d2dab9e4b6e3e79a04b55f280e5f,5cd0a348ada94d29f58e5654c266230cd6428f02..a44e50e94cc550359fe92a09a0900c2b9d18d8ca
--- 1/unmodified_drivers/linux-2.6/platform-pci/Kbuild
--- 2/unmodified_drivers/linux-2.6/platform-pci/Kbuild
+++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild
@@@ -4,9 -4,4 +4,9 @@@ obj-m := xen-platform-pci.
  
  EXTRA_CFLAGS += -I$(M)/platform-pci
  
- xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o
+ xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o platform-compat.o
 +
 +# Can we do better ?
 +ifeq ($(ARCH),ia64)
 +  xen-platform-pci-objs += xcom_mini.o xencomm.o
 +endif

diff --cc unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index cb9e8dd7e5a87b3c5fd4e0c5d150c3109b32b316,9e7fc58ebfadf9ea18d5cfa4704f3679441d2914..5ff6ba83f7c8ffddcbecdf5c23af195a34a304d0
--- 1/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- 2/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@@ -33,11 -33,9 +33,12 @@@
  #include <asm/irq.h>
  #include <asm/uaccess.h>
  #include <asm/hypervisor.h>
+ #include <asm/pgtable.h>
  #include <xen/interface/memory.h>
  #include <xen/features.h>
 +#ifdef __ia64__
 +#include <asm/xen/xencomm.h>
 +#endif
  
  #include "platform-pci.h"
  

diff --cc xen/arch/ia64/vmx/mmio.c
Simple merge

diff --cc xen/arch/ia64/vmx/vmx_init.c
Simple merge

diff --cc xen/include/public/arch-ia64.h
Simple merge